*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 528797249586bdaebe3462b890ab8e0b6b2ab5d2..93064c3d5b90752dac2d971451b10a73bf3aea1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if
+       depth is 0 (noticed by Tim Janik)
+
 2004-11-15 Erwann Chenede - <erwann.chenede@sun.com>
       
        * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 528797249586bdaebe3462b890ab8e0b6b2ab5d2..93064c3d5b90752dac2d971451b10a73bf3aea1b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if
+       depth is 0 (noticed by Tim Janik)
+
 2004-11-15 Erwann Chenede - <erwann.chenede@sun.com>
       
        * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805)

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 528797249586bdaebe3462b890ab8e0b6b2ab5d2..93064c3d5b90752dac2d971451b10a73bf3aea1b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if
+       depth is 0 (noticed by Tim Janik)
+
 2004-11-15 Erwann Chenede - <erwann.chenede@sun.com>
       
        * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 528797249586bdaebe3462b890ab8e0b6b2ab5d2..93064c3d5b90752dac2d971451b10a73bf3aea1b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtktreemodel.c (gtk_tree_path_prev): Return FALSE if
+       depth is 0 (noticed by Tim Janik)
+
 2004-11-15 Erwann Chenede - <erwann.chenede@sun.com>
       
        * gtk/gtkfilesel.c: fix unselect in multiple selection (#156805)

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index eed61bde44ae0fbfec75f29330d4994c997a78e2..786dd035b56b2140cf37ed91f6c26db91166ba58 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * queryloaders.c (query_module): Set vtable->module before
+       calling fill_vtable(), since gdk-pixbuf-io.c does does the
+       same and modules may rely on it.  (#158177, Dan Winship)
+
 2004-11-12  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk-pixbuf-io.c (gdk_pixbuf_io_init): Don't use 

diff --git a/gdk-pixbuf/queryloaders.c b/gdk-pixbuf/queryloaders.c
index 21aa320eb053fd174b4cf63ea4f46c12023872ed..1fc5d58b3e8edfabdebcf9700b9f9a07aa398b23 100644 (file)
--- a/gdk-pixbuf/queryloaders.c
+++ b/gdk-pixbuf/queryloaders.c
@@ -181,7 +181,9 @@ query_module (const char *dir, const char *file)
 #endif 
                info = g_new0 (GdkPixbufFormat, 1);
                vtable = g_new0 (GdkPixbufModule, 1);
-               
+
+               vtable->module = module;
+
                (*fill_info) (info);
                (*fill_vtable) (vtable);
                

diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 148f153f26f58ac28511049d94d48e837b41422e..033c5cfc46344d0e50dfa1631f6183d69ea70f33 100644 (file)
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -734,6 +734,9 @@ gtk_tree_path_prev (GtkTreePath *path)
 {
   g_return_val_if_fail (path != NULL, FALSE);
 
+  if (path->depth == 0)
+    return FALSE;
+
   if (path->indices[path->depth - 1] == 0)
     return FALSE;